From 8d8fb0cd5f1e0fa6ddff28128e272d3013bd22fb Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Mon, 11 Feb 2002 16:58:23 +0000 Subject: [PATCH] set upper member of hadjustment correct, so the hscrollbars of lists Mon Feb 11 17:54:46 2002 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper member of hadjustment correct, so the hscrollbars of lists smaller than 1 page (in width) are somewhat saner --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktreeview.c | 2 +- 8 files changed, 43 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9694fe9449..ece3d3723a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 11 17:54:46 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper + member of hadjustment correct, so the hscrollbars of lists smaller + than 1 page (in width) are somewhat saner + 2002-02-11 jacob berkman * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9694fe9449..ece3d3723a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Feb 11 17:54:46 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper + member of hadjustment correct, so the hscrollbars of lists smaller + than 1 page (in width) are somewhat saner + 2002-02-11 jacob berkman * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9694fe9449..ece3d3723a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Feb 11 17:54:46 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper + member of hadjustment correct, so the hscrollbars of lists smaller + than 1 page (in width) are somewhat saner + 2002-02-11 jacob berkman * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9694fe9449..ece3d3723a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Feb 11 17:54:46 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper + member of hadjustment correct, so the hscrollbars of lists smaller + than 1 page (in width) are somewhat saner + 2002-02-11 jacob berkman * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9694fe9449..ece3d3723a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Feb 11 17:54:46 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper + member of hadjustment correct, so the hscrollbars of lists smaller + than 1 page (in width) are somewhat saner + 2002-02-11 jacob berkman * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9694fe9449..ece3d3723a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Feb 11 17:54:46 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper + member of hadjustment correct, so the hscrollbars of lists smaller + than 1 page (in width) are somewhat saner + 2002-02-11 jacob berkman * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9694fe9449..ece3d3723a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Feb 11 17:54:46 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_size_allocate): set upper + member of hadjustment correct, so the hscrollbars of lists smaller + than 1 page (in width) are somewhat saner + 2002-02-11 jacob berkman * gdk/gdkwindow.h (gdk_get_default_root_window): fix signature to diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 9b772a4b78..fcacd4eb1e 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1594,7 +1594,7 @@ gtk_tree_view_size_allocate (GtkWidget *widget, tree_view->priv->hadjustment->page_increment = allocation->width; tree_view->priv->hadjustment->step_increment = allocation->width / 10; tree_view->priv->hadjustment->lower = 0; - tree_view->priv->hadjustment->upper = tree_view->priv->width; + tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->page_size, tree_view->priv->width); if (tree_view->priv->hadjustment->value + allocation->width > tree_view->priv->width) tree_view->priv->hadjustment->value = MAX (tree_view->priv->width - allocation->width, 0); -- 2.30.2